From 6b7503b83e1acb5fb94916860d18338352c62539 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 2 Aug 2017 13:12:17 +0100
Subject: [PATCH] placessidebar: Remove EventBox usage

---
 gtk/gtkplacessidebar.c     |  6 ++---
 gtk/gtksidebarrow.c        |  8 ------
 gtk/gtksidebarrowprivate.h |  1 -
 gtk/ui/gtksidebarrow.ui    | 54 ++++++++++++++++++--------------------
 4 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 9e374632de..037fed9b1f 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -437,7 +437,6 @@ add_place (GtkPlacesSidebar            *sidebar,
   gboolean show_eject_button;
   GtkWidget *row;
   GtkWidget *eject_button;
-  GtkWidget *event_box;
 
   check_unmount_and_eject (mount, volume, drive,
                            &show_unmount, &show_eject);
@@ -463,13 +462,12 @@ add_place (GtkPlacesSidebar            *sidebar,
                       NULL);
 
   eject_button = gtk_sidebar_row_get_eject_button (GTK_SIDEBAR_ROW (row));
-  event_box = gtk_sidebar_row_get_event_box (GTK_SIDEBAR_ROW (row));
 
   g_signal_connect_swapped (eject_button, "clicked",
                             G_CALLBACK (eject_or_unmount_bookmark), row);
-  g_signal_connect (event_box, "button-press-event",
+  g_signal_connect (GTK_SIDEBAR_ROW (row), "button-press-event",
                     G_CALLBACK (on_button_press_event), row);
-  g_signal_connect (event_box, "button-release-event",
+  g_signal_connect (GTK_SIDEBAR_ROW (row), "button-release-event",
                     G_CALLBACK (on_button_release_event), row);
 
   gtk_container_add (GTK_CONTAINER (sidebar->list_box), GTK_WIDGET (row));
diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index d60ef4db62..78a837f3c0 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -46,7 +46,6 @@ struct _GtkSidebarRow
   GMount *mount;
   gboolean placeholder;
   GtkPlacesSidebar *sidebar;
-  GtkWidget *event_box;
   GtkWidget *revealer;
 };
 
@@ -454,7 +453,6 @@ gtk_sidebar_row_class_init (GtkSidebarRowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, icon_widget);
   gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, label_widget);
   gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, eject_button);
-  gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, event_box);
   gtk_widget_class_bind_template_child (widget_class, GtkSidebarRow, revealer);
 
   gtk_widget_class_bind_template_callback (widget_class, on_child_revealed);
@@ -486,9 +484,3 @@ gtk_sidebar_row_get_eject_button (GtkSidebarRow *self)
 {
   return self->eject_button;
 }
-
-GtkWidget *
-gtk_sidebar_row_get_event_box (GtkSidebarRow *self)
-{
-  return self->event_box;
-}
diff --git a/gtk/gtksidebarrowprivate.h b/gtk/gtksidebarrowprivate.h
index d13dc6d830..ee0fe28812 100644
--- a/gtk/gtksidebarrowprivate.h
+++ b/gtk/gtksidebarrowprivate.h
@@ -49,7 +49,6 @@ void           gtk_sidebar_row_hide   (GtkSidebarRow *self,
 void           gtk_sidebar_row_reveal (GtkSidebarRow *self);
 
 GtkWidget     *gtk_sidebar_row_get_eject_button (GtkSidebarRow *self);
-GtkWidget     *gtk_sidebar_row_get_event_box    (GtkSidebarRow *self);
 void           gtk_sidebar_row_set_icon         (GtkSidebarRow *self,
                                                  GIcon         *icon);
 
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index 9d92bc142b..f446134e4b 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -14,36 +14,32 @@
           <class name="sidebar-revealer"/>
         </style>
         <child>
-          <object class="GtkEventBox" id="event_box">
+          <object class="GtkBox">
             <child>
-              <object class="GtkBox">
-                <child>
-                  <object class="GtkImage" id="icon_widget">
-                    <style>
-                      <class name="sidebar-icon"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_widget">
-                    <property name="hexpand">1</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="sidebar-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="eject_button">
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="margin-start">4px</property>
-                    <property name="icon-name">media-eject-symbolic</property>
-                    <style>
-                      <class name="sidebar-button"/>
-                    </style>
-                  </object>
-                </child>
+              <object class="GtkImage" id="icon_widget">
+                <style>
+                  <class name="sidebar-icon"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_widget">
+                <property name="hexpand">1</property>
+                <property name="xalign">0</property>
+                <style>
+                  <class name="sidebar-label"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="eject_button">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin-start">4px</property>
+                <property name="icon-name">media-eject-symbolic</property>
+                <style>
+                  <class name="sidebar-button"/>
+                </style>
               </object>
             </child>
           </object>
-- 
2.30.2